From 65d4b4871099fa97da6d7f877b6819e60971af4e Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Sat, 1 Jun 2024 22:30:37 +0300 Subject: [PATCH] luci-app-acme: Add Log reader Signed-off-by: Sergey Ponomarev --- .../resources/view/{ => acme}/acme.js | 0 .../resources/view/acme/logread.js | 4 ++++ .../usr/share/luci/menu.d/luci-app-acme.json | 20 +++++++++++++++++-- .../usr/share/rpcd/acl.d/luci-app-acme.json | 4 +++- 4 files changed, 25 insertions(+), 3 deletions(-) rename applications/luci-app-acme/htdocs/luci-static/resources/view/{ => acme}/acme.js (100%) create mode 100644 applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js diff --git a/applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js b/applications/luci-app-acme/htdocs/luci-static/resources/view/acme/acme.js similarity index 100% rename from applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js rename to applications/luci-app-acme/htdocs/luci-static/resources/view/acme/acme.js diff --git a/applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js b/applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js new file mode 100644 index 0000000000..ff2294ab53 --- /dev/null +++ b/applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js @@ -0,0 +1,4 @@ +'use strict'; +'require tools.views as views'; + +return views.LogreadBox("acme", "acme"); \ No newline at end of file diff --git a/applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json b/applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json index aa855905ae..335be3c2f5 100644 --- a/applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json +++ b/applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json @@ -3,11 +3,27 @@ "title": "ACME certificates", "order": 50, "action": { - "type": "view", - "path": "acme" + "type": "alias", + "path": "admin/services/acme/configure" }, "depends": { "acl": [ "luci-app-acme" ] } + }, + "admin/services/acme/configure": { + "title": "Configure", + "order": 10, + "action": { + "type": "view", + "path": "acme/acme" + } + }, + "admin/services/acme/logread": { + "title": "Log View", + "order": 20, + "action": { + "type": "view", + "path": "acme/logread" + } } } diff --git a/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json b/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json index a8bd9f9fb3..5abeab0632 100644 --- a/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json +++ b/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json @@ -6,7 +6,9 @@ "file": { "/proc/sys/kernel/hostname": [ "read" ], "/etc/ssl/acme": [ "list" ], - "/usr/libexec/acmesh-dnsinfo.sh": [ "exec" ] + "/usr/libexec/acmesh-dnsinfo.sh": [ "exec" ], + "/sbin/logread -e acme": [ "exec" ], + "/usr/sbin/logread -e acme": [ "exec" ] }, "uci": [ "acme" ] }, -- 2.30.2